From 766be60d93bcd1cf1339a6eccab27b4b7a0b9466 Mon Sep 17 00:00:00 2001 From: "smh22@tempest.cl.cam.ac.uk" Date: Mon, 23 Feb 2004 15:55:21 +0000 Subject: [PATCH] bitkeeper revision 1.739 (403a2269-JWq-jre7gx2LoYk7KxayQ) support for weird-ass scsi controller device nodes --- BitKeeper/etc/ignore | 1 + .../arch/xeno/drivers/block/xl_vbd.c | 26 +++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 8f37a6a534..9027593341 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -542,3 +542,4 @@ TAGS tools/xc/lib/xc_netbsd_build.o xen/arch/i386/pdb-stub.o xen/common/debug-linux.o +xen/drivers/char/serial.o diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c index 0677096b84..cf39c5d71a 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c @@ -122,20 +122,30 @@ static int xlvbd_init_device(xen_disk_t *xd) goto out; } - if ( is_ide ) - { + if ( is_ide ) { + major_name = XLIDE_MAJOR_NAME; max_part = XLIDE_MAX_PART; - } - else if ( is_scsi ) - { + + } else if ( is_scsi ) { + major_name = XLSCSI_MAJOR_NAME; max_part = XLSCSI_MAX_PART; - } - else - { + + } else if (XD_VIRTUAL(xd->info)) { + major_name = XLVBD_MAJOR_NAME; max_part = XLVBD_MAX_PART; + + } else { + + /* SMH: hmm - probably a CCISS driver or sim; assume CCISS for now */ + printk(KERN_ALERT "Assuming device %02x:%02x is CCISS/SCSI\n", + major, minor); + is_scsi = 1; + major_name = "cciss"; + max_part = XLSCSI_MAX_PART; + } partno = minor & (max_part - 1); -- 2.30.2